Skip to content
This repository has been archived by the owner on Jul 18, 2024. It is now read-only.

Integration/1.8.0 #1

Closed
wants to merge 510 commits into from

Conversation

pccowboy
Copy link

@pccowboy pccowboy commented Feb 9, 2018

[VME-1568] Merge in upstream terraform-provider-aws release 1.8.0

Merge commit '8937a3a4e9d77c8089cf147861b604e3a2d8cf7e' into integration/valimail_aws_provider

bflad and others added 30 commits January 11, 2018 15:04
r/db event subscription: set source type when updating categories
This is the AWS provider, so we should probably use AWS examples
This provider is no longer in the core repo, so this document does not relate to core features
r/aws_ecs_cluster: support resource import
…ue. (hashicorp#2777)

* d/aws_ssm_parameter: Support returning raw encrypted SecureString value.

It is useful to have it for triggers or other purposes. Defaults to
returning decrypted value as before.

* d/aws_ssm_parameter: Simplify test case.

I think there is no need to add another test case just for in parameter
check. Simply randomize it to be 100% sure.

* Make test deterministic
…ormatting-and-links

docs: Fix formatting & add missing links
Add postgres example to aurora documentation
The previous phrase "AWS only supports VPC peering within the same AWS region." existed in the documentation, it's no longer accurate since hashicorp#2508 opened up multi-regional peering capabilities and was merged and released in provider version 1.7.
Update documentation to reflect external regional peering.
… checks

Fixes hashicorp#2978 "Validation forces invalid path for TCP health check" 

Currently the validation forces the health check path to begin with a slash("/"), even when the protocol is TCP, in which case the health check path must be blank. The validation is preventing valid use cases. 

Since this validation can only check the one field on its own, the check is amended to only validate the path begins with a "/" if the path is not blank. Note that when the path is blank, it is not passed to AWS at all (see lines 226-228), so I think this change does not weaken validation.
bflad and others added 19 commits January 26, 2018 10:31
…ting-testacc

docs/CONTRIBUTING: Remove pre-split provider directory references from testacc commands
…queue-queuerecentlydeleted-timeout

resource/aws_sqs_queue: Retry creation on QueueDeletedRecently for additional 10 seconds
…modb_global_table-import

test/aws_dynamodb_global_table: Use single region for basic and import testing
…y-import

r/guardduty: fix typo in guardduty import test
…-go-v1.12.70

Bump aws-sdk-go to v1.12.70
…tic_beanstalk_application-missing-app-crash

resource/aws_elastic_beanstalk_application: Prevent crash on reading missing application
* resource/aws_dynamodb_table: Refactoring

* Address review comments
Merge commit '8937a3a4e9d77c8089cf147861b604e3a2d8cf7e' into integration/valimail_aws_provider
@dweinand
Copy link

I'm confused by this. I would expect that we'd be re-cutting our integration branch from upstream and then layering our changes on top. This approach seems ripe for problems.

@dweinand
Copy link

@pccowboy Did you see my concern here?

@pccowboy
Copy link
Author

I did, sorry I did not comment sooner. I am recutting the integration branch as you suggest, and then layering the coveo/new-ssm-parameters-features branch and our two branches (bug-correct-source-region and feature/add_valimail_circleci) on top.

@pccowboy
Copy link
Author

I'm going to close this PR, and reopen with the new branch.

@pccowboy pccowboy closed this Feb 14, 2018
@pccowboy pccowboy deleted the integration/1.8.0 branch February 14, 2018 22:22
pccowboy pushed a commit that referenced this pull request Jun 25, 2018
make glue crawler creation wait for role ready
petergoldstein pushed a commit that referenced this pull request Aug 10, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Development

Successfully merging this pull request may close these issues.